From c003cac3af964cc6290114c61bf280fee0ee52e7 Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Tue, 29 Dec 2020 12:09:10 -0700
Subject: [PATCH] switch windows release build from 32 bit to 64 bit (only).

---
 GPSBabel.pro           |  2 +-
 appveyor.yml           | 16 ++++++++--------
 gui/setup.iss          |  2 ++
 gui/setup.iss.in       |  2 ++
 gui/setup.iss.qmake.in |  2 ++
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/GPSBabel.pro b/GPSBabel.pro
index 5ca3d54dc..2b351ba24 100644
--- a/GPSBabel.pro
+++ b/GPSBabel.pro
@@ -243,7 +243,7 @@ win32 {
 
 win32-msvc* {
   DEFINES += _CRT_SECURE_NO_DEPRECATE
-  QMAKE_CXXFLAGS += /MP -wd4100
+  QMAKE_CXXFLAGS += /MP -wd4100 -wd4267
 }
 
 include(shapelib.pri)
diff --git a/appveyor.yml b/appveyor.yml
index 14829154a..1b0e4bbc7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,16 +4,16 @@ version: 1.0.{build}
 
 environment:
   matrix:
-  - arch: x86
-    qt: 5.12\msvc2017
+  - arch: x86_amd64
+    qt: 5.12\msvc2017_64
     flow: nmake
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-  - arch: x86
-    qt: 5.12\msvc2017
-    flow: msbuild
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   - arch: x86_amd64
     qt: 5.12\msvc2017_64
+    flow: msbuild
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  - arch: x86
+    qt: 5.12\msvc2017
     flow: nmake
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   - arch: x86
@@ -37,7 +37,7 @@ build_script:
       echo "qt: $env:qt"
       qmake -query
       Get-Location
-      if (($env:flow -eq "nmake") -and ($env:arch -eq "x86") -and ($env:qt -eq "5.12\msvc2017"))
+      if (($env:flow -eq "nmake") -and ($env:arch -eq "x86_amd64") -and ($env:qt -eq "5.12\msvc2017_64"))
       {
         # full build and deploy of our release configuration
         & ".\tools\make_windows_release.ps1" -flow $env:flow -buildinstaller "true"
@@ -71,7 +71,7 @@ deploy_script:
   - ps: |
       $env:projdir=(C:\msys64\usr\bin\bash.exe -c "pwd")
       C:\msys64\usr\bin\bash.exe -lc "cd $env:projdir; ./tools/ci_tokens"
-      if (($env:flow -eq "nmake") -and ($env:arch -eq "x86") -and ($env:qt -eq "5.12\msvc2017") -and ($env:APPVEYOR_REPO_BRANCH -eq "master"))
+      if (($env:flow -eq "nmake") -and ($env:arch -eq "x86_amd64") -and ($env:qt -eq "5.12\msvc2017_64") -and ($env:APPVEYOR_REPO_BRANCH -eq "master"))
       {
         $verid=(Get-Date -UFormat "%Y%m%dT%H%MZ" -Date (Get-Date -Date (git show -s --format="%aI" HEAD)).toUniversalTime()) `
                + '-' + (git rev-parse --short=7 HEAD)
diff --git a/gui/setup.iss b/gui/setup.iss
index 4148c70dc..e41eea576 100644
--- a/gui/setup.iss
+++ b/gui/setup.iss
@@ -25,6 +25,8 @@ AppPublisher=GPSBabel
 AppPublisherURL=https://www.gpsbabel.org
 AppSupportURL=https://www.gpsbabel.org
 AppUpdatesURL=https://www.gpsbabel.org
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode=x64
 DefaultDirName={pf}\GPSBabel
 DefaultGroupName=GPSBabel
 OutputDir=release
diff --git a/gui/setup.iss.in b/gui/setup.iss.in
index 5bf12acbd..28b85489b 100644
--- a/gui/setup.iss.in
+++ b/gui/setup.iss.in
@@ -25,6 +25,8 @@ AppPublisher=GPSBabel
 AppPublisherURL=https://www.gpsbabel.org
 AppSupportURL=https://www.gpsbabel.org
 AppUpdatesURL=https://www.gpsbabel.org
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode=x64
 DefaultDirName={pf}\GPSBabel
 DefaultGroupName=GPSBabel
 OutputDir=release
diff --git a/gui/setup.iss.qmake.in b/gui/setup.iss.qmake.in
index 5585a8de1..ac1269842 100644
--- a/gui/setup.iss.qmake.in
+++ b/gui/setup.iss.qmake.in
@@ -25,6 +25,8 @@ AppPublisher=GPSBabel
 AppPublisherURL=https://www.gpsbabel.org
 AppSupportURL=https://www.gpsbabel.org
 AppUpdatesURL=https://www.gpsbabel.org
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode=x64
 DefaultDirName={pf}\\GPSBabel
 DefaultGroupName=GPSBabel
 OutputDir=release
-- 
2.30.2